Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update release-1.15 to Hugo version 0.57.2 #16813

Merged
merged 1 commit into from
Oct 27, 2019
Merged

Update release-1.15 to Hugo version 0.57.2 #16813

merged 1 commit into from
Oct 27, 2019

Conversation

zacharysarah
Copy link
Contributor

@zacharysarah zacharysarah commented Oct 11, 2019 •
edited
Loading

This PR reintroduces #16094, which replicates #16104 and #16151 for release-1.15.

Fixes #16066

Context

#16066 exhibits behavior characteristic of gohugoio/hugo#5615. To resolve the issue, we need to upgrade Hugo to a version that includes the solution.

Because #16094 got lost in the release timing shuffle, this PR didn't make it into release-1.15 before 1.16 was released. This PR also needs to be introduced into master in a separate PR.

/sig docs
/priority important-soon

/assign @aimeeu

@k8s-ci-robot k8s-ci-robot added sig/docs Categorizes an issue or PR as relevant to SIG Docs. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 11, 2019
@aimeeu
Copy link
Contributor

aimeeu commented Oct 11, 2019 •
edited
Loading

End user acceptance testing https://deploy-preview-16813--k8s-v1-15.netlify.com/

  • "latest version" link in deprecation warning on k8s.io points to https://kubernetes.io/docs/home/ (from issue 16606)
  • "latest version" link in deprecation warning on k8s.io/docs/home points to https://kubernetes.io/docs/home/ (from issue 16606)
  • links on Home page point to 1.15 version
  • reference API docs 1.15 version and buttons work
  • eyeball links on various pages to make sure they all point to 1.15

Locally:

  1. Fetch the PR
  2. run from <website_dir>: $ make check-hugo-versions
  • output states the Hugo versions match between Makefile and netlify.toml
  1. Install Hugo version specified and compile site using hugo server
    • One compile warning:
    Building sites … WARN 2019/10/11 10:59:15 Content directory "/home/aimee/Dev/git/github.com/aimeeu/k8s/sigdocs/website/content/en/docs/reference/kubernetes-api" have both index.* and _index.* files, pick one.
  • Docs smoke test page renders correctly
  1. Build the Docker container
  • make docker-image builds a Docker image with the Hugo version specified in the makefile
  • make docker-serve executes without error

Based on my random testing, I'd say this is good to push once the makefile has been updated.

@aimeeu
Copy link
Contributor

aimeeu commented Oct 11, 2019 •
edited
Loading

@zacharysarah - @kbhawkey pointed out in PR #16814 that the Makefile needs to be updated. Should be do that here as well to keep the Hugo version in sync between the Makefile and netlify.toml?

@zacharysarah
Copy link
Contributor Author

@aimeeu

@kbhawkey pointed out in PR #16814 that the Makefile needs to be updated. Should be do that here as well to keep the Hugo version in sync between the Makefile and netlify.toml?

Done!

@zacharysarah
Copy link
Contributor Author

@zparnold Please wrangle when ready. 🤠

@zacharysarah
Copy link
Contributor Author

/assign @bradtopol

@jimangel
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 27, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jimangel

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit 2785482 into kubernetes:release-1.15 Oct 27, 2019
@zacharysarah zacharysarah deleted the update-hugo-for-1.15 branch October 29, 2019 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sftim sftim Awaiting requested review from sftim

@stewart-yu stewart-yu Awaiting requested review from stewart-yu

Assignees

@jimangel jimangel

@bradtopol bradtopol

@aimeeu aimeeu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zacharysarah @aimeeu @jimangel @k8s-ci-robot @bradtopol